merge emacs-23
authorKenichi Handa <handa@m17n.org>
Tue, 31 Jan 2012 11:33:20 +0000 (20:33 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 31 Jan 2012 11:33:20 +0000 (20:33 +0900)

Trivial merge